From 47a82640a8e185e7e78d5e92de482052a488cd8d Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 15 Nov 2016 16:20:18 +0100 Subject: [PATCH] Revert "Covert GtkOverlay to indirect rendering" This reverts commit fd4a1cdad60fd291abd59dd5b13905430a674d99. GtkOverlay uses clipping and render nodes can't clip yet. --- gtk/gtkoverlay.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index 2c35b9eb2f..fb60952e50 100644 --- a/gtk/gtkoverlay.c +++ b/gtk/gtkoverlay.c @@ -24,8 +24,6 @@ #include "gtkbuildable.h" #include "gtkscrolledwindow.h" #include "gtkmarshalers.h" -#include "gtkwidgetprivate.h" -#include "gtkcontainerprivate.h" #include "gtkprivate.h" #include "gtkintl.h" @@ -474,20 +472,6 @@ gtk_overlay_unmap (GtkWidget *widget) GTK_WIDGET_CLASS (gtk_overlay_parent_class)->unmap (widget); } -static GskRenderNode * -gtk_overlay_get_render_node (GtkWidget *widget, - GskRenderer *renderer) -{ - GskRenderNode *res = gtk_widget_create_render_node (widget, renderer, G_OBJECT_TYPE_NAME (widget)); - - if (res == NULL) - return NULL; - - gtk_container_propagate_render_node (GTK_CONTAINER (widget), renderer, res); - - return res; -} - static void gtk_overlay_remove (GtkContainer *container, GtkWidget *widget) @@ -746,6 +730,7 @@ gtk_overlay_get_child_property (GtkContainer *container, } } + static void gtk_overlay_class_init (GtkOverlayClass *klass) { @@ -758,7 +743,6 @@ gtk_overlay_class_init (GtkOverlayClass *klass) widget_class->unrealize = gtk_overlay_unrealize; widget_class->map = gtk_overlay_map; widget_class->unmap = gtk_overlay_unmap; - widget_class->get_render_node = gtk_overlay_get_render_node; container_class->remove = gtk_overlay_remove; container_class->forall = gtk_overlay_forall; -- 2.30.2